Removed #PRAGMA } from headers. Also, make compile if you don't have it

1999-11-23  Jonathan Blandford  <jrb@redhat.com>

	* Removed #PRAGMA } from headers.  Also, make compile if you don't
	have it installed, already.

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 970db8662f6b6151b9525aaf3ac65d4435ce1218..e4f332190f3ffb768cde5f04b95484ba0526c5ce 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,8 @@
+1999-11-23  Jonathan Blandford  <jrb@redhat.com>
+
+       * Removed #PRAGMA } from headers.  Also, make compile if you don't
+       have it installed, already.
+
 1999-11-22  Raja R Harinath  <harinath@cs.umn.edu>
 
        * configure.in (GDK_PIXBUF_DIR): Fix for srcdir != builddir.

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 9ce2c3181c8e6a87fc1b8b7fd3450204d46d26ef..9e1a12ff60453527cd8ff2d09e8a6c3f88cf40c3 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -49,7 +49,7 @@ testpixbuf_LDADD = $(LDADDS) $(LIBART_LIBS) \
 
 testpixbuf_drawable_LDADD = $(LDADDS)
 
-GDK_PIXBUF_LIBS = -lgdk_pixbuf $(LIBART_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
+GDK_PIXBUF_LIBS = $(LIBART_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
 
 #
 # The GdkPixBuf library
@@ -81,53 +81,53 @@ noinst_HEADERS = \
 #
 libpixbuf_png_la_SOURCES = io-png.c
 libpixbuf_png_la_LDFLAGS = -avoid-version -module
-libpixbuf_png_la_LIBADD = $(LIBPNG) $(GDK_PIXBUF_LIBS)
+libpixbuf_png_la_LIBADD = $(LIBPNG)
 
 #
 # The JPEG loader
 #
 libpixbuf_jpeg_la_SOURCES = io-jpeg.c
 libpixbuf_jpeg_la_LDFLAGS = -avoid-version -module
-libpixbuf_jpeg_la_LIBADD = $(LIBJPEG) $(GDK_PIXBUF_LIBS)
+libpixbuf_jpeg_la_LIBADD = $(LIBJPEG)
 
 #
 # The XPM loader
 #
 libpixbuf_xpm_la_SOURCES = io-xpm.c
 libpixbuf_xpm_la_LDFLAGS = -avoid-version -module
-libpixbuf_xpm_la_LIBADD = $(GDK_PIXBUF_LIBS)
+libpixbuf_xpm_la_LIBADD =
 
 #
 # The GIF loader
 #
 libpixbuf_gif_la_SOURCES = io-gif.c
 libpixbuf_gif_la_LDFLAGS = -avoid-version -module
-libpixbuf_gif_la_LIBADD = $(GDK_PIXBUF_LIBS)
+libpixbuf_gif_la_LIBADD =
 
 #
 # The RAS loader
 #
 libpixbuf_ras_la_SOURCES = io-ras.c
 libpixbuf_ras_la_LDFLAGS = -avoid-version -module
-libpixbuf_ras_la_LIBADD = $(GDK_PIXBUF_LIBS)
+libpixbuf_ras_la_LIBADD =
 
 #
 # The TIFF loader
 #
 libpixbuf_tiff_la_SOURCES = io-tiff.c
 libpixbuf_tiff_la_LDFLAGS = -avoid-version -module
-libpixbuf_tiff_la_LIBADD = $(LIBTIFF) $(GDK_PIXBUF_LIBS)
+libpixbuf_tiff_la_LIBADD =
 
 #
 # The PNM loader
 #
 libpixbuf_pnm_la_SOURCES = io-pnm.c
 libpixbuf_pnm_la_LDFLAGS = -avoid-version -module
-libpixbuf_pnm_la_LIBADD = $(GDK_PIXBUF_LIBS)
+libpixbuf_pnm_la_LIBADD =
 
 #
 # The BMP loader
 #
 libpixbuf_bmp_la_SOURCES = io-bmp.c
 libpixbuf_bmp_la_LDFLAGS = -avoid-version -module
-libpixbuf_bmp_la_LIBADD = $(GDK_PIXBUF_LIBS)
+libpixbuf_bmp_la_LIBADD =

diff --git a/gdk-pixbuf/gdk-pixbuf-io.h b/gdk-pixbuf/gdk-pixbuf-io.h
index 6cd889e7648b527c555d23a3cc17b4c5ae9b034c..b1de4accb2c2f208d74cacaf8340a086261a4aa6 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-io.h
+++ b/gdk-pixbuf/gdk-pixbuf-io.h
@@ -33,7 +33,6 @@
 
 #ifdef __cplusplus
 extern "C" {
-#pragma }
 #endif
 
 \f

diff --git a/gdk-pixbuf/gdk-pixbuf.h b/gdk-pixbuf/gdk-pixbuf.h
index 027a8fdeee9b6483270e05da77dde155785aabad..b4a68e260968383acf5184c2004491eb6bda6c9d 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf.h
+++ b/gdk-pixbuf/gdk-pixbuf.h
@@ -31,7 +31,6 @@
 
 #ifdef __cplusplus
 extern "C" {
-#pragma }
 #endif
 
 \f